From 6d1bd9e1e9686381f8f6d29450380aa97c73a96e Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 22 Feb 2004 03:15:45 +0000 Subject: [PATCH] Guard the FC_HINT_STYLE stuff with an #ifdef, so we still build with most Sat Feb 21 19:09:55 2004 Manish Singh * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE stuff with an #ifdef, so we still build with most fontconfig versions. * configure.in: Bump the fontconfig version requirement down to 1.0.1, to match pango (probably isn't needed at all, but doesn't hurt). --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtksettings.c | 4 +++- 6 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f56e15c4d..49af186567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Feb 21 19:09:55 2004 Manish Singh + + * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE + stuff with an #ifdef, so we still build with most fontconfig versions. + + * configure.in: Bump the fontconfig version requirement down to 1.0.1, + to match pango (probably isn't needed at all, but doesn't hurt). + Sun Feb 22 03:03:29 2004 Matthias Clasen * gtk/gtkaction.c: (gtk_action_finalize): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3f56e15c4d..49af186567 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Sat Feb 21 19:09:55 2004 Manish Singh + + * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE + stuff with an #ifdef, so we still build with most fontconfig versions. + + * configure.in: Bump the fontconfig version requirement down to 1.0.1, + to match pango (probably isn't needed at all, but doesn't hurt). + Sun Feb 22 03:03:29 2004 Matthias Clasen * gtk/gtkaction.c: (gtk_action_finalize): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3f56e15c4d..49af186567 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Sat Feb 21 19:09:55 2004 Manish Singh + + * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE + stuff with an #ifdef, so we still build with most fontconfig versions. + + * configure.in: Bump the fontconfig version requirement down to 1.0.1, + to match pango (probably isn't needed at all, but doesn't hurt). + Sun Feb 22 03:03:29 2004 Matthias Clasen * gtk/gtkaction.c: (gtk_action_finalize): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3f56e15c4d..49af186567 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Sat Feb 21 19:09:55 2004 Manish Singh + + * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE + stuff with an #ifdef, so we still build with most fontconfig versions. + + * configure.in: Bump the fontconfig version requirement down to 1.0.1, + to match pango (probably isn't needed at all, but doesn't hurt). + Sun Feb 22 03:03:29 2004 Matthias Clasen * gtk/gtkaction.c: (gtk_action_finalize): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3f56e15c4d..49af186567 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Sat Feb 21 19:09:55 2004 Manish Singh + + * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE + stuff with an #ifdef, so we still build with most fontconfig versions. + + * configure.in: Bump the fontconfig version requirement down to 1.0.1, + to match pango (probably isn't needed at all, but doesn't hurt). + Sun Feb 22 03:03:29 2004 Matthias Clasen * gtk/gtkaction.c: (gtk_action_finalize): diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index ab7623f489..a0421a412e 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -153,7 +153,8 @@ gtk_default_substitute (FcPattern *pattern, if (hinting >= 0 && FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) FcPatternAddBool (pattern, FC_HINTING, hinting != 0); - + +#ifdef FC_HINT_STYLE if (hintstyle && FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch) { int val = FC_HINT_FULL; /* Quiet GCC */ @@ -173,6 +174,7 @@ gtk_default_substitute (FcPattern *pattern, if (found) FcPatternAddInteger (pattern, FC_HINT_STYLE, val); } +#endif /* FC_HINT_STYLE */ if (rgba && FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch) { -- 2.30.2